This reverts commit 8e11f9e3f3. Reason for revert: reland after fixing b/186028624 Bug: 184190315 Change-Id: Ia7339a46c3af7dd1a95bc82327cae5304f9f2e16
8e11f9e3f3