Revert "Fix full-eng build breakage due to dbacd826a100f2c." am: d5715c5d2d am: c6b5b67139 am: f9b3f6b9e6
am: 1833088893

Change-Id: Iaa70f715aaa3dd8ff6e0f2a65afe5a11505debf2