Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48 am: bce78b316b am: 6b68e48c46
am: 4c45dd89df

Change-Id: I41707e5666b7c86e629bec80a69a900d6bc510b4
tree: 329e62e3c384489adb50b518637110b5b7ccf9c6
  1. tests/