Merge "One more light grey addition." into pi-dev am: ff207fdf86
am: c69723ea51

Change-Id: I181545b1dcf80e0dc3cb7716453a134ea73c366b