Merge "Color of the ring around the lock icon" into oc-dr1-dev
am: 0903e31e72

Change-Id: I4cb8d6e0987543fa9e189c508398ba70d683064d