[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

Change-Id: I9e9ebdf80094ca9207543822cfeee307416b31c5
tree: 707c36f79dc5fd1297e2f970ac6d9f6c5a33e571
  1. tests/