Merge "Annotate Parcelable CREATOR fields as @NonNull" am: 8ced10ec23 am: 83c77f688a
am: 826516c579

Change-Id: I60df70cd823ab524c8ff3b6f316cb82adfc788d8