[automerger skipped] Merge changes I3babc72d,I79d231e2 am: 6d82630b8f
am: 00343b0f5b -s ours
am skip reason: change_id I3babc72dfe72337c4d68facb1695aec15e504c90 with SHA1 4af108aacf is in history

Change-Id: I9e29fc84ed9212339a85839c97cd5d4131ae7d3c
tree: c225305d2abb3a5120a79f9c986a9f42677e4cf6
  1. tests/