Merge "Add OnDevicePersonalization to DeviceConfig.java." into tm-dev