Fix broken build introduced by ag/3016038
am: 6bb001ff0c

Change-Id: Ia93c30d8bb028661dd8c948b706a1553d584ffba