Merge "Duplicate tests for duplicated symbols." am: 2bf1d3dae2
am: 89ae96a184

Change-Id: I5c63bdc7012c800ced9be9f663286c8d5421b1f7