Merge "User avatar didn't have enough contrast" into oc-dr1-dev am: 4cef646e6a
am: 93b3fe20b9

Change-Id: I20fc30964f39bb98b8268c1ac04561615f40ea22