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

Change-Id: I3b7588360b9e302a6032ae6242d937f4e68eb88d