[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870 am: 7f4a3db8e5 am: f6cfb759d4

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