Merge "Fix bounds rotation logic" into nyc-mr1-dev am: 8e10f945bd
am: 27482d46e3

Change-Id: I3ee3c58381c520d76270a276b5dae073ee016cbd