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

* commit 'ca85c9e15ea4bab05d69d557d5e144ac3a98a87b':

Change-Id: If9dd2ab996448907a07341887ddd6c297e44d23e