This reverts commit 5b0dd45a. Reason for revert: b/184978217? Change-Id: Ie92632f0373376f238eac5638aba71a1a31abdcf