[DO NOT MERGE ANYWHERE] Do not set device_provisioned am: 069716ad77 -s ours am...
Joseph Johnson [Wed, 23 Nov 2016 22:29:00 +0000 (22:29 +0000)]
am: 4611b78ce0  -s ours

Change-Id: I071c0171c4872c4911c18cc77ae9f7353a811da6


Trivial merge