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

Change-Id: Ie6e2713060cd58fc14eab62d8b7b059b9585b98d