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

Change-Id: Id9670a6706aa7254ede01872cfcdce526aed7b63