Merge "resolve merge conflicts of cb29c97907f3 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp
am: 9b89e5b02c

Change-Id: Ic8b7884517db042123f6e86a36461dc75d913cde