Merge "CTS: Modify smart selection tests." into oc-dev am: 34ebc137e2
am: dfa703d9b3

Change-Id: If8443fdf0034fda6788c7418fd6076c0f3dcaa99