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

Change-Id: I4b5cd5aa47debaedb115bd78cdd19fdda2bba552