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

Change-Id: Id340d94a65ed656ad003ea310d2c5c476a840999