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

Change-Id: I9ea102b35bd08bde0710ccab322fe1bf6749a31d