Merge changes from topic "n" into nougat-cts-dev
am: a220d6d27d

Change-Id: I406953a4713b768012d123a33db06268e8cf3799
tree: 437a5c2b9bb14a7ffac6c80b297d67d10065ee21
  1. tests/