resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp

Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3