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

Change-Id: Idd0c12ea791db459dbba39115c38eae843634bb9