Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev