Merge "Fix the user profile icon." into oc-mr1-dev am: 6ebd3594ae
am: 1d4daee10d

Change-Id: I2e9e2fb1e3c2cbb5f13ff3a4c9ec94a03c78064c