Android N IOT Release 2 (NIT1.180611.010.B1)
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: 0356f27b44
am: 52c38d1f45

Change-Id: Ibc450d694ca1eb27cfbd4ae68677964d77024f8a