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

Change-Id: If164a0a4fdbb7afe1eddd0d33fda4ddc2aeadf44