Merge "Add test cases for bugs 1869746 and 1873518"