Android N IOT Release 2 (NIT1.180611.010.B1)
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I69562f7185479fd7a8f27f611a4a6f94f658535f