Android N IOT Preview 4 (NIH40E)
merge in nyc-iot-release history after reset to nyc-iot-dev