Fix warnings

Change-Id: I29116541a87df21264c8a22e09222511df608b82
Merge topic 'catalyst-web-interactive-composite' into next

b9c9028c Fix warnings