This reverts commit 48a8f59607. Reason for revert: b/349287459 (cherry picked from https://android-review.googlesource.com/q/commit:b3f0337ae62af7b2ce66acaabdf5d8d874d16bb4) Merged-In: I5835cc025b37efca4d6294abf4aefd7148ddfd65 Change-Id: I5835cc025b37efca4d6294abf4aefd7148ddfd65
48a8f59607