This reverts commit 217cf31b. Reason for revert: b/162063775 Change-Id: Idce34003532e3d93f2908766918763bf1256fa80