Fix return value.

Change-Id: Ia97c519a887cd1e289c561029945b17de5113728
Merge topic '14744_cleanup_views' into next

4806dc72 Fix return value.