Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37 am: 25b87f5cad am: c0a1334c94 am: 60a61510cd am: 5722d0a4ec am: 4d17676ff1
am: 8aae042e7a

Change-Id: Ic9a4e809ce44b1b6ef11a0cc8a1eae719efea638
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/