resolve merge conflicts of 307435f to nyc-dev-plus-aosp

Change-Id: I4b46d9d5a9e7e8fa4fc1d65c316dc7569c96a10a