am e4e3a85f: Merge commit \'af6ccb69\' into manualmerge

Merge commit 'e4e3a85fae3f468d901922450a8da1fc89f7d702'

* commit 'e4e3a85fae3f468d901922450a8da1fc89f7d702':
  Add dpi tests to CTS.