This reverts commit 3164c0a2. Reason for revert: b/177917240 Change-Id: I69f541698a3068d59553d555846ba45d169fbbed