[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 am: 267c79976c

Change-Id: I20767cf2f8b8f73720285d2716ad444dd0ea4371
tree: 4dc73dbab6acb2851f5ad24beb73edb13278a932
  1. tests/