Merge "Fix @NonNull -> Nullable for Intent.replaceExtras()."
am: 645a9d1253

Change-Id: Ia09f8a945159951a2a098dc88001d9509f704335