Merge \"Workaround to avoid crash in user photo selection\" into nyc-dev
am: 8f75abf92f

Change-Id: Ic0378c50fdc7661e76eed36acc9e935351998f04