Fix warnings in generated code.

Change-Id: I85ce609ff0ac1f31474d7579584eed9d5b08c4df
Merge topic 'refactor_panels' into next

efbf0f1 Fix warnings in generated code.