Bug: 64382372 Bug: 73114663 This reverts commit 782f9b66. Change-Id: I910ec73af9ca82ed922c43942b57b84d6622bfd4