This reverts commit fb4a768c. Reason for revert: PM request Change-Id: I9f367e2de44618d9e4d5f1787403b2d1e653cb14