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

Change-Id: I6f77ad829384ef029d7741afb838b493771caa03


Trivial merge