This reverts commit bd8b3453. Reason for revert: b/207034379 Change-Id: I48d9b5289dd52d72f925cb155f38c5a1ed493d49