Merge "Adding guard for new Intent Extra introduced in post NYC." into nyc-andromeda-dev