am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad

* commit 'd46d6f8e729b0e40878b53763387604a9193385a':
  Fix flash issue