resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp am: 289688de68
am: 619fa2673f

Change-Id: Id9c94a0b2b3b0b89e297a7bc7dddc0b5a51aede5