This reverts commit d4da9ce1. Reason for revert: b/174516527 Bug: 174516527 Change-Id: I6cc50409e4697c3eab3ac8d5f2fbb3fc609b83d3