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

Change-Id: I7471a5ba1d531b118a26545c7d1fc4dc538a1507
tree: bd026db6bea8df19f4e3d89b00ea14540a7c88ed
  1. tests/