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

Change-Id: Ic5b812965d239de88c98beab411ea5752ec38252