Android N IOT Release 2 (NIT1.180611.010.B1)
Merge "Fix a memory leak"