[DO NOT MERGE ANYWHERE] Do not set device_provisioned am: 069716ad77 -s ours am...
Joseph Johnson [Tue, 15 Nov 2016 23:43:04 +0000 (23:43 +0000)]
am: f862f38295  -s ours

Change-Id: If4dce266024005be790cc5656a38dd04fe412ac9


Trivial merge