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

Change-Id: Ia69b9364862014ea59f8001f1b8e19fc912dc279
tree: 8919bc3ae0943bbaa43f4381d20654e20438ba86
  1. tests/