Merge changes from topic "flicker-rotation"
am: f2a739d5f0

Change-Id: I189755fcce0f1576870d252dbe1f4f30a7aa6ea4