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

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