Merge changes from topic "flicker-move" am: 3289d4616b am: a533b92720
am: cbc94dba27

Change-Id: I80226ff003f4fed703305f74699d95531d04945b