Merge "Fix another issue with constructing SafeActivityOptions" into pi-dev am: a6ef087d24
am: c611cdda98

Change-Id: Ie61c670ba4ef986541116132249e1c333750f408