[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 skip reason: subject contains skip directive

Change-Id: Ibb681c28fce1178d35aecd26591d3744bf85e0df