This reverts commit 1c7b1fcf. Bug: 73255278 Bug: 111357976 bug: 117533193 Reason for revert: Test failures Change-Id: I9da863fd95264007c4efeb85539e704e83499dcf