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

Change-Id: If474a4cfac9727955fb10b6a8f420e71fb9fff0c
tree: e5f80f1c4246d14fb520cb677b261d5e47acc301
  1. tests/