Merge "ParcelableHolder shouldn't write anything for empty case"