[automerger skipped] Merge "Send broadcast to request high res photo sync" am:...
[automerger skipped] Merge "Send broadcast to request high res photo sync" am: 6d09f931 am: b5886ddb -s ours
am: 356cda58 -s ours
am skip reason: change_id I85212d6173567a305868a631a610f003b8cbc7a7 with SHA1 e4cfadf5 is in history
Change-Id: I486f3b98b966655a2965e1e928eeaa88d3faebc0