Merge "Add isPivotSet/resetPivot" into pi-dev am: 6045d66aa2
am: 530d626b81

Change-Id: I592dd6459b9526393602d9845d0191c291f56cb6