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

Change-Id: I7f43dc0677b00234fa33f5e01ebdc330a7568f05