am 5e7f9a1c: Merge "Reuse device display code from sdk-common"

* commit '5e7f9a1c01c04e882090fdc57fa2966915523844':
  Reuse device display code from sdk-common