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

Change-Id: I8fe04b0b55f0497ead899feb5ab11ea9da181a92


Trivial merge