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

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