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

* commit '7f9ed679556ae2a0788696b96efc78c9c3ba0f40':
  Rename some DeviceInfo properties in CTS