Merge "Allocate memory before reading from parcel"
am: be8881da3b

Change-Id: I794c9cb48900a9568802aac760767b29df0fdbd1