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

Change-Id: I56779a1509b84b9777b42f7cddc0df8e793ebbde