Merge "Do not force expected-xml"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Mon, 15 Jan 2018 19:05:50 +0000 (19:05 +0000)
committerGerrit Code Review <gerrit@linuxfoundation.org>
Mon, 15 Jan 2018 19:05:50 +0000 (19:05 +0000)

Trivial merge