This reverts commit 4c90f99c. Reason for revert: b/291252863 Change-Id: I646b039a305a1297167e0c56b0bce0f541da260d