DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
am: ad929db743

Change-Id: Ib2ef17356334d2340a5aa0250a4b5ffbdd9c4dd0