[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a31 am: 83c8faf6 am: ffed9269 Change-Id: If05f004d7ade94836de1e9eb65cdfaeae28b230e