[automerger skipped] DO NOT MERGE No smart text assist for unprovisioned device. am: 7c8a46e0dd -s ours am: 67722b0557 -s ours am: 447f279010 -s ours
am: 4dbab056a2 -s ours
am skip reason: change_id I360250a5c2a92d09c8d8f559b51c74f490f70c2c with SHA1 9796a1bd00 is in history

Change-Id: I974bede444217ab468df568cb6257f0e69008108