Merge "Removed unused targets" am: 37e5f7a0cb am: dd173eb2f7
am: c6bc9499a6

Change-Id: Iba12d2bf2f54715189c94406233d19fb82a1f43e