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

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