[automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7 am: b5c3ab95a8 am: efcf101cf2
am: 23be4acd42

Change-Id: I52e0d6d57386c941d838db5d105e15d38a899b74
tree: b200fff2914576bdb3d59836b60e90f4adb0b12b
  1. tests/