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

Change-Id: I34bd3e3833d5d7cd52264a5aa34bee18c51bb095