Merge "Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am: 0950fb3d20 am: eaaa9ae321" into nyc-mr1-dev-plus-aosp
am: ab9c6365ab

* commit 'ab9c6365abd916072af545297d3198296bcb9782':

Change-Id: I3222c4a5217c589ee33d0f10e15706533d57f2b3