Merge "Minor fixes" into cframework/master
authorMauro Sardara <[email protected]>
Tue, 27 Feb 2018 17:10:59 +0000 (17:10 +0000)
committerGerrit Code Review <[email protected]>
Tue, 27 Feb 2018 17:10:59 +0000 (17:10 +0000)

Trivial merge