Resolve merge conflicts of 9aa94df to nyc-dev

Change-Id: Ib0c8e823eec8036bdda59aed5ee96c8807571542