am 0af7ae49: Merge "DO NOT MERGE synchronize photo storage creation for race conditions." into lmp-dev

* commit '0af7ae496b016635724a3fa3243eb12e569bf592':
  DO NOT MERGE synchronize photo storage creation for race conditions.