Fix warnings

Change-Id: I2f6a86dce7134215492492112fc34a863cd76bfd
Merge topic 'add_stereo_type_to_pvx' into next

2f894d7 Fix warnings