Fixed warnings.

Change-Id: I7972f46ec82dd05090f61806261a565f3c631f3e
Merge topic 'orthographic_view_extras' into next

592b890a Fixed warnings.