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

Change-Id: I8684b0a2b1fbe2611acc02766903afa4086968da