am e15da1e4: am 382c239d: Merge "Rename some DeviceInfo properties in CTS" into klp-dev

* commit 'e15da1e4ea2f774eb35c2b3360c91e9c3c5e92ba':
  Rename some DeviceInfo properties in CTS