resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am: ed852bf557