[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 am: 8b3cecef9a
am: eb6a83658e  -s ours

Change-Id: If21ad1798aa9d2185e2feedaf7d76c7762f59f11
tree: e5f80f1c4246d14fb520cb677b261d5e47acc301
  1. tests/