Fix test failure

Change-Id: I633452a207f8e484b8d8e6294e54de4172caf18a
Merge topic 'value-rendering' into master

7a49dbf5 Fix test failure