resolve merge conflicts of e9d901a to nyc-dev am: 3b1cbcd66a
am: 38660e5dfc

Change-Id: Ia6e4cfec76557101bc15e707d145bf5d085b47e3