Merge "BUG-5269 Enable device capabilities override"
authorTomas Cere <[email protected]>
Tue, 16 Feb 2016 13:32:44 +0000 (13:32 +0000)
committerGerrit Code Review <[email protected]>
Tue, 16 Feb 2016 13:32:44 +0000 (13:32 +0000)

Trivial merge