Auto-rotate config fix

Change-Id: Iba53efbd54ee5f6899ee4d944e8c69662d9e5667
Merge "Auto-rotate config fix" into cm-10.1