resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev
fix conflict in nyc-mr2-release
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
(cherry picked from commit f806d65e615b942c268a5f68d44bde9d55634972)
1 file changed