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

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