Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair * commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408': Add dpi tests to CTS.
Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair * commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408': Add dpi tests to CTS.