Merge "CP ag/1234128 to resolve unit test failures in intermediate branches" into nougat-cts-dev