Merge "Remove duplicate targets." am: ac3dc8fd94
am: f44e5af5b5

Change-Id: I2a2d54a7c2f5de77b353421f6809bcad04b01983