Merge changes from topic "n" into nougat-cts-dev
am: a220d6d27d

Change-Id: I1228020231b3d1e0d9e26891b813060bcc862c4c
tree: 35c8978ed2d99d22d57536ccbb4f85213d82667d
  1. tests/