This reverts commit 90bb3709dc. Reason for revert: b/214053959 Change-Id: Ic271bab1d3eaf677a5989dda9deb944ee2ad6850
90bb3709dc