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

Change-Id: Ie9e2f0cf91733e72e08dff48eb92434a3188f116
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/