This reverts commit ff43f4e6a6. Reason for revert: b/140813780 Change-Id: Id5988b9ec959ca9b294f6bd5caa30c8156238d0a
ff43f4e6a6
f2c0f4aadf
cde927c935