Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331 am: 178f67f69d am: a88a1fed27 am: 7071758bd8
am: 7edafe88ad

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