Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev
am: 36b9badd7a

Change-Id: I95af41e36a50a3f83b53dda7348e3dfd1cf93d64
tree: 3cfc405f22847ea44743da0c9a343404ecde7883
  1. tests/