Merge "Remove the lock in ParcelableHolder"