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

Change-Id: Id8c3cfcd2a64bb17a1f9058e594b4d17a5d65232