Change-Id: Ibc29760e05841c6f3cf7c548601fdb63b3f671f6
Implements: blueprint savanna-renaming-extra Change-Id: I5db8125aee11e617b5aa3b16eb7691b11e3d7281
Change-Id: I0fdf1e9e8c7a41ae085e94783899b2d9e999f921