Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f...