Merge \"Fix rotated clip regions\" into nyc-mr1-dev
am: 06f13cba5f

Change-Id: I4afab3a863f1f873e9dd95ed671072874a6a4511