Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262
am: 0954180087

Change-Id: Ia1975e0053d3d719ba678abbc7d48d7b74e43357