Merge "Refactor code to create DeviceConfiUtils class" into tm-mainline-prod