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

Change-Id: Iac3339e21d94a5d14316f5df2761ab10cdda28d0