Merge "fix build" into nyc-dev-plus-aosp
am: 879663f51f

Change-Id: Ic838214ef814db944085287b1667ac9e58a086c2