resolve merge conflicts of 7a2ff82b29 to nyc-dev-plus-aosp

Change-Id: Ibbd4c6e39b1e30aa1aec7ff6edb0b9a01c585fb3