Merge changes I752858da,Icd9db4f1 into nougat-cts-dev am: abbf59c104 am: 3fe8e8f3c3
am: f189d3a4c6

Change-Id: I42f6c20f6c7121cab156de4e3087f273b4a43466