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

Change-Id: I156174893b4fa190767156d2fc17058dafc3f49e