Merge "RESTRICT AUTOMERGE Add test of startActivities with different uids" into oc-mr1-dev