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

Change-Id: I83085ac2acf75df0557abac0118e0654c533ce28
tree: f3f0cc4dfc1fd0c32aee204964900997d22853ac
  1. tests/