Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401
am: 0aaa2c606c

Change-Id: I9b705a7105e5e6abb0370837f4927e33ab504e3e