am 7f9ed679: am e15da1e4: am 382c239d: Merge "Rename some DeviceInfo properties in CTS" into klp-dev * commit '7f9ed679': Rename some DeviceInfo properties in CTS