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

Change-Id: I117259585aff22358b01358ae1f7425450851c43
tree: 4dc73dbab6acb2851f5ad24beb73edb13278a932
  1. tests/