Merge "resolve merge conflicts of 56a2b529 to nyc-dev am: d7dcc3e2 am:...

Merge "resolve merge conflicts of 56a2b529 to nyc-dev am: d7dcc3e2 am: 34377e03 am: 68cce397 am: 4453c3cd am: 79a32d0a  -s ours am: 9c358ccb  -s ours am: 72bbe1d6  -s ours am: c6d39d47  -s ours" into oc-mr1-dev-plus-aosp