Fix build
am: aaef0983ba

Change-Id: Ia4d360cb942c43180d6077cd01bd9e9eb5b598d5