Fix 2 HTG warnings.

Change-Id: I39e122bceb53baaff0bc1dd5faed056a0d03ce7a
Merge topic 'fix-htg-warnings' into master

4d1e57bc Fix 2 HTG warnings.