Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
am: 5962c9a234

Change-Id: I2193a17eb99173895f9397d18d8361e1eb4568d6
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/