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

Change-Id: I6bc6a23c88ad0e6128fc31278f4a206a78652926
tree: 8919bc3ae0943bbaa43f4381d20654e20438ba86
  1. tests/