Merge nougat-cts-dev revision e34e3b07f3a46c7e7494371f25ebe59f8986c936 into nougat-mr1-cts-dev.
am: 594f733bc6

Change-Id: I47fac0275f9604daee4bf916606f9b3b842464fe