resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5 am: f47f5ecf0b