Merge "Fix NullPointerException when set profile photo"
am: a1287f7872

Change-Id: I227f62fb6c2ac25d53cb225e68db0665f3e90786