am 6b8094d6: (-s ours) am a8a7282c: Merge "Fix CTS build" into mnc-dev

* commit '6b8094d6f3f9e664b3db48f78aa89162c60a45a3':
tree: 9779095e5a603526d44704c559c820d3628c5ea8
  1. tests/