Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into oc-dev

* changes:
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63 am: 3a295c1c7f
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450
  Verify last array's length in readFromParcel