Merge "Adding handling for different kind of MPDs (previously the front end could...
authorLuca Muscariello <[email protected]>
Mon, 19 Jun 2017 12:30:20 +0000 (12:30 +0000)
committerGerrit Code Review <[email protected]>
Mon, 19 Jun 2017 12:30:20 +0000 (12:30 +0000)

Trivial merge