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

* commit '85fa5405a4e6681037355e77295fe4b72bc55167':
  DO NOT MERGE synchronize photo storage creation for race conditions.