0263a679f2
This reverts commit a5ead45967.
Reason for revert: b/274169859
Change-Id: Id214694ae4f61cd70796c6f7e932c1fdef82d746