[DO NOT MERGE ANYWHERE] Do not set device_provisioned am: 069716ad -s ours am: 69535790 -s ours am: 263d14b0 -s ours am: 4611b78c -s ours am: 0a8b75e1 -s ours am: f862f382 -s ours Change-Id: If4dce266024005be790cc5656a38dd04fe412ac9