This reverts commit 267ecd15. Reason for revert: regression b/223088536 Change-Id: I5e82ad358a8c7c7027415ab55c5d7e5bd3c05527