Merge "Small fixes to ownership, test mode."
authorAric Gardner <agardner@linuxfoundation.org>
Tue, 3 Nov 2015 19:20:53 +0000 (19:20 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 3 Nov 2015 19:20:53 +0000 (19:20 +0000)

Trivial merge