Merge "Add support for OS Plugin v2.35"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Sat, 23 Jun 2018 14:58:13 +0000 (14:58 +0000)
committerGerrit Code Review <gerrit@linuxfoundation.org>
Sat, 23 Jun 2018 14:58:13 +0000 (14:58 +0000)

Trivial merge