Merge "More light grey additions." into pi-dev am: 0ebc883b2c
am: c8e1963908

Change-Id: Ib2c8676e0323ef018628e4a327ffd4cce0b7e7b7