Merge "fix the build am: 0631aee am: 1f10295" into nyc-mr1-dev-plus-aosp