This reverts commit bde98075. Reason for revert: b/185615919 Change-Id: I4906f109de478361790e459c117bd5d6a88a778c