Merge "Merge "Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 am: 56e2b90936" into rvc-d1-dev-plus-aosp am: 6efa9a45e4" into rvc-qpr-dev-plus-aosp