Merge remote-tracking branch 'genius/master'
authorThanh Ha <thanh.ha@linuxfoundation.org>
Tue, 19 Jun 2018 13:39:44 +0000 (09:39 -0400)
committerThanh Ha <thanh.ha@linuxfoundation.org>
Tue, 19 Jun 2018 13:43:04 +0000 (09:43 -0400)
Change-Id: If0d0fc38f472b584a82d3e47220275c041e39773
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Trivial merge