This reverts commit ea12f9a7. Reason for revert: b/238845492 Change-Id: I369804d817e943f58d42087c77db83017a34e459