Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into nyc-mr1-dev
* changes:
[automerger] Verify number of Map entries written to Parcel am: 057a01d1 am: d6947f1c
[automerger] Verify number of Map entries written to Parcel am: 057a01d1
Verify number of Map entries written to Parcel