Fix test failure

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

9446581e Fix test failure