Merge "Reapply "Removed unused targets"" am: 1209899b1c
am: 8035963c83

Change-Id: Iadfe4e0f878a577c5956a014bf03f9ea8ed0dbab