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

* commit '3c765b075e577f90b4145885a9c3e302064f8dec':
  DO NOT MERGE synchronize photo storage creation for race conditions.