Merge "Ensure rotate disable2 flag can be set on boot" into pi-dev am: 65808f3210
am: 5a435bf08b

Change-Id: Id3a3ef17d6cd2c9839171e7ac90088ab05a963ed