This reverts commit 155951f2. Reason for revert: broke test in pi-dev/stage-aosp-master Change-Id: I917e170b570b89ba2e8a26cec0bf0a8adf577b80