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

Change-Id: I7be389cacc368dd60506cbf0824350ac4247a016