Merge "Merge "Adding missing CTS test" into nougat-mr1-cts-dev am: 4689fb2319  -s ours"