Merge "Add enable/disable test"
authorFlorin Coras <florin.coras@gmail.com>
Tue, 11 Apr 2017 20:02:19 +0000 (20:02 +0000)
committerGerrit Code Review <gerrit@fd.io>
Tue, 11 Apr 2017 20:02:19 +0000 (20:02 +0000)

Trivial merge