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

Change-Id: I0012d9529835ac4dc00b90df36e38631cd00b40b