Merge "Do not set outActivity if value is null." into oc-dev
am: a09111e745

Change-Id: I5bae5f17d2b50f845f1b147458b3351bbf99b615