[automerger skipped] Merge changes from topics "141018421_set3", "146905502" am: 79cb7e4361 am: 83a53679ca am: b458ff0908 -s ours
am skip reason: Change-Id I6b538f78f401ec5e67bb6c27ae7e032b3df384c0 with SHA-1 5052de6568 is in history

Change-Id: Ia29d3ff76d77576532130970d1c8aaf09400d91f