resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp
am: 836a404525

Change-Id: I56ca4033b9359c9626a1e8d963e57036d21e2cfb