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

Change-Id: Ia8a8f429c52afef9c115f373f36217f63ae2c094