Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
am: f582e9dede

Change-Id: Ie9702984ab2e7a3d90ce0237d5c5593446d4b664
tree: 35c8978ed2d99d22d57536ccbb4f85213d82667d
  1. tests/