Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80
am: 10c1a704c0

Change-Id: Id77a5d6a58e7ab4fdaa0b7c15b824270863b83fd
tree: 27c00dbb4fe971e89e603e2372cce6f33fffe9a5
  1. core/
  2. services/
  3. tests/