Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master" am: d26b43b4d5
am: 84cde9eb08

Change-Id: Ie189450dabdb837096872b54c425458d9eeb7726
tree: 04cddc984ae0a5c44fc08855c3b708226665407b
  1. tests/