Merge "Remove duplicate targets."
am: ac3dc8fd94

Change-Id: I101914247dd2d5614301fb0393be6431b4611041