[automerger skipped] DO NOT MERGE Fix the set of activities when configuring a...
[automerger skipped] DO NOT MERGE Fix the set of activities when configuring a preferred activity. am: 7bec653f -s ours am: 96ea5f82 -s ours
am skip reason: subject contains skip directive
Change-Id: Iceb414255e4064cf835faeddbb1028fd1ad59a1c