Merge "Fix some flakiness with rotation" into rvc-dev am: 9b874cc2 am: 5adfff0a am: 5656574e am: e728a769 Change-Id: Ie978997d25343cc4a26c490da2945074631e0626