Merge "Revert "Update golden images for tests following commit 5c228d5""