Merge changes from topic "flicker-move" am: 7943776f9a am: 7f0716ff54 am: ec64dab4eb
am: 7d867c2923

Change-Id: I57c6759c421a7e4f99c898e1c61a65e221e10334