Merge "Don\'t run DPM tests if the feature is not available." into nyc-dev
am: e83a86f820

* commit 'e83a86f8207742b7b38286308da7ee6240361ef0':
  Don't run DPM tests if the feature is not available.

Change-Id: I72a209228931aaee9f23772581ccfd4083616ab9