am a310500f: am 2dd63ccd: am d8ccd712: Merge "Parcel compRequired flag correctly."

* commit 'a310500f6c29685e6b3db3f3e58fc8415272a13c':
  Parcel compRequired flag correctly.