Merge "Add test case for issue 170357245"