This reverts commit 352a3997. Reason for revert: b/209711453 Change-Id: I27469bb0d74c0226eb4cee48b7b787fef74a54b3