Merge "Fix lint"

This commit is contained in:
Zuul 2018-12-13 06:31:22 +00:00 committed by Gerrit Code Review
commit 53d21bffb7