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

Change-Id: Icb0a0a7dad359e8fb3921adc9cf76eb92af2ac45