resolve merge conflicts of 00f07be to nyc-mr1-dev-plus-aosp

Change-Id: I82865b2847c584f8a1d728ef76113e3969f222ca