Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master am: 8653b32a48
am: bce78b316b

Change-Id: I45c0a02a71c774ae16420bc9d1edf5785b496a41
tree: 04cddc984ae0a5c44fc08855c3b708226665407b
  1. tests/