[automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e am: eac2219dc5 am: db6090eaf9 am: 808e81dd22

Change-Id: I5dd1f11b861143d2dd51ff6feb572550d609a1df
tree: 8279758a4550cfce624f11d4ff6d530872c9d758
  1. tests/