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

Change-Id: Idbe3b03a8345db85b7e32d4e7198a78c1df42270