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

Change-Id: I5b975831401c860cf8486b2c9ae18a391d3e17c3