Merge "CTS: Tap to select word inside smart selection." into oc-dev am: bd3a85356a
am: 2bb22d5683

Change-Id: Icb546e87ac0e77715cf6e69143d027d339ac9264