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

Change-Id: I171da8ec35958bc0b57a0d649fbb7b3d83624910