Fix build
am: 005055c070

Change-Id: Ica900e6a6e7413408ac5d79dedfcf41526011be0