Fix build
am: aaef0983ba

Change-Id: I087952f069da1ba624bef32d1ac913a242533321