Merge "Fix NPE in parcel constructor"
am: 23a6598fe4

Change-Id: I686adb8ab08b17681a10caacca47a926477487d1