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

Change-Id: I61a066abf79207c1258ceb2ef2b0c34224dff009