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

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