[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49

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