Merge ""Guest" icon should be a default user icon." into pi-dev
am: e44eb9201f

Change-Id: Iaff857f2418b0336fb96c4baed3649e9efccb1fc