This reverts commit 722a3606. Exempt-From-Owner-Approval: clean revert Reason for revert: Broke the apps build Change-Id: I14e25b924d7415a53a5f5994054f4fd5d9ff99cc