Fix build am: aaef0983ba
am: 2c410e0d5f

Change-Id: I10728186af370d9e47196eeda43dfeccc582bc74