Fix view object creation.

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

88b14b4d Fix view object creation.
more duplicated conflict code

Change-Id: I44fa0d682813378ec602b2a140a862e101fbdb59
Merge topic 'use-external-data' into next

6dda1be2 more duplicated conflict code