[automerger skipped] Merge changes from topic "flicker-move" am: 3289d4616b am: a533b92720 am: cbc94dba27
am: 8e9b0aa01b -s ours
am skip reason: change_id I32a59475ced80d7eaa062181c732ce0f9a81cca5 with SHA1 df5290534e is in history

Change-Id: I37136b3638b116597d0d654b9e986b6e1cfd2d1d