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

Change-Id: I6e94c7014e2ae8fe3d99520e9cb95b918e9bf586
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/