This reverts commit af6c4c00. Reason for revert: b/38117654 Change-Id: Iaf808d3ba12ced816be251214cb20ceba247e9ff