Merge "Update the color of security status icons" into pi-dev
am: c883db167a

Change-Id: I738495f88c1655b0e3e479eb56812a670ab785f6