Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
am: 1fd90c968d

Change-Id: I419475c5ec1b574b27e3886e8b814896b052e338
tree: f36d063dc47508a933d6f53648e46572d71fe611
  1. tests/