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

Change-Id: I0444212f97b92755ef9f52f973e4dd2fde494d04
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/