Merge "DEVICE_PROVISIONED was moved to global settings."
am: d43e82f86a

Change-Id: Idb518a391f663279badddaa064bfb459f72fa251