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

Change-Id: I72ec5e42fc9567cb1d752843a836ae3a63768d4a
tree: 6678dc9f5bb443088e8c2046cd627cef5bc101b2
  1. tests/