Merge "Remove library tag" am: 8739852bde am: f68bbf7b00
am: 3647972753

Change-Id: I0ddc0b6c64b18be3008e873e7d3966e91b5810ab