[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 am: 4f6dffda1d

Change-Id: Id9de44aa722aa75f21c26d71a2e33db1a934aee6
tree: 8279758a4550cfce624f11d4ff6d530872c9d758
  1. tests/