[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
am: 234cc79182

Change-Id: I8a13377d42f369193276bd6895be6ac5593eb934
tree: 707c36f79dc5fd1297e2f970ac6d9f6c5a33e571
  1. tests/