Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a am: 10c1a704 am: 736194df am: 21031042 Change-Id: Ib289e1c933f34b2712258a258cc312342d9005c3