This reverts commit ba5e25e3b1.
Reason for revert: b/183706857
Bug: b/171950236
Change-Id: Icdd1c76ed650539520a2ebf8ece078f17cdf9deb
This reverts commit ba5e25e3b1.
Reason for revert: b/183706857
Bug: b/171950236
Change-Id: Icdd1c76ed650539520a2ebf8ece078f17cdf9deb