This reverts commit 99a3213f. Reason for revert: <PLATFORM_VERSION_CODENAME != REL> Bug: 64267858 Change-Id: I783d3dffcb627e6633fcc964da853e6554c43e9a