This reverts commit 8d584f0a. Reason for revert: b/72967560 Change-Id: I9ca3c4a586e740a7b7d4cc5940ca8d4e4ebf3654