This reverts commit ef2df587. Reason for revert: suspect to cause build break in b/201948713 Change-Id: If46219746913bec87ca2030ba51a6094246a0211