This reverts commit 1b72a7fe. Reason for revert: b/73204553 Change-Id: I1c116c126b9b235fa0209252a16059854cab2d19