Merge "Add disable2 flag for rotate suggestions" into pi-dev am: bd24572e17
am: 05a3cfd4d5

Change-Id: I8e7ab1195b8b78a0959e55cca5e205504fe8969d