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

Change-Id: I4fe72e7f2d6d8ed75ce8f36234c89cc8f7306ed1
tree: 851bda8ef6bd55683ec9e546308ede926eb1ea57
  1. tests/