Merge "Add ParcelableHolder type" am: 7d2fc62868

Change-Id: If7258d57ff14020c3127aa7eadd892ed51301cd4