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

Change-Id: I8d5476ee6673e253494a58d984b3196018b0f3ef