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

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