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

Change-Id: I094118c829df08c7dbd6db7a1bf38faedf013450