[DO NOT MERGE ANYWHERE] Do not set device_provisioned am: 069716ad77 -s ours am...
Joseph Johnson [Wed, 23 Nov 2016 22:35:11 +0000 (22:35 +0000)]
am: 6c6d39d92b  -s ours

Change-Id: Ibb117a1ef32900305ff7065230380ee938a08857


Trivial merge