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

Change-Id: I505befe55f0ee93a4600bfc60a298ef467803111