Merge commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken * commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1': Include the API level 4 fields in the Parcel.
Merge commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken * commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1': Include the API level 4 fields in the Parcel.