Merge changes from topic "asb-2018-04-n" into nougat-cts-dev
am: 46b33d45f7

Change-Id: Iae1309a64a877bb2965e2bb407206cd0e891e44e
tree: f36d063dc47508a933d6f53648e46572d71fe611
  1. tests/