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

Change-Id: Ida85480582dfecf292d2eabe924443ab2406a008