Revert "Revert "Fix build after ag/2001747 breakage.""

This reverts commit 430d0510e6ada9fdbed7dcdd9d70d8bb1208c855.

Test: I build full-eng successfully

Change-Id: I77166a8a36e893be476a1067356124914a607c39
3 files changed