Merge "Reject smart selection if outside original selection." into oc-dev am: 6dcae2b91f
am: 4aeea2404c

Change-Id: I2ef8f172023446def205cfd0b3e6384ab12fee7a