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

Change-Id: Ice6945e3f3c9910922c8bc6c61cb1e9f2aba647c
tree: 6b5eebb8d730724770759b68e0767d0c0618b1c7
  1. tests/