[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 am: e477541e10

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