Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37 am: 25b87f5cad am: c0a1334c94
am: 60a61510cd

Change-Id: I7a8a2d7c487fbfd20885dd00e3606d1d5c8777a9
tree: f053791b2ab65c58895d16b53dad660248e0a11b
  1. tests/