[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: e44db5a1c0 -s ours
am skip reason: subject contains skip directive

Change-Id: I896588e2d821c9d1a2aada72713b1c239756cfc3