Merge "Rename some DeviceInfo properties in CTS" into klp-dev