[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1

Change-Id: I5d3d4f63359eec49e4d57613ff6c7c77d7377d6e
tree: 35c8978ed2d99d22d57536ccbb4f85213d82667d
  1. tests/