This reverts commit 19e81e4d. Reason for revert: b/184842617 Change-Id: Ifd86b175df18ec3de2b06cd25a6e0bea7c374a3a