resolve merge conflicts of b928ccefb6 to nyc-dev

Change-Id: I966ee45aaa2f8150421d57d8464f03eca47c3c4c