This reverts commit 836faaad. Reason for revert: b/119055885 Change-Id: Ib1104297cfb8504506581fde8c7672d0bbcf6e11