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

Change-Id: I6b2610145d5299326b73f3897359e5f3b0e0694d