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

Change-Id: I3c9a96bd2f82c4261f235f77dccd3878682d1dca
tree: 851bda8ef6bd55683ec9e546308ede926eb1ea57
  1. tests/