Merge "Fixed CTS unit tests" into nougat-cts-dev