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

Change-Id: I1837a37df705ba233b33befed9ac10e5e92b42c6