This reverts commit d8a72d7d. Reason for revert: root cause for b/214013899 Change-Id: If769708408c419c2fd3d9484fbf40202b7276299