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

Change-Id: Iffcf7f437e5e438796f01dd86e9599047292cd2f
tree: 437a5c2b9bb14a7ffac6c80b297d67d10065ee21
  1. tests/