Merge "Light grey bugbot updates." into pi-dev am: bfa0ee12cf
am: 10c6f9f3b2

Change-Id: I0b1fac4240f194a64cb2eee04fbf12da553f5e3c