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

Change-Id: I2cb9d3571284f259c73641ca9fc9898c58df89f1