Merge "No smart text assist for unprovisioned device." into oc-dr1-dev
am: bda6275cf6

Change-Id: Id2563d13af2b6d6ee2f0a7a05f31e2a905d53150