Merge "Tightening up rotation behavior for PIP (3/3)" into oc-dev
am: c2627353c4

Change-Id: I867999bac435926e9f54fb33e489ea3f44d1dad0