Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e" into nougat-mr1-cts-dev
tree: 5e67b2c53bd38bd3c7d0dd8ae83b3d6e2dbdbc71
  1. tests/