Merge 4.4.82 into nyc-iot-dev
am: fbc4ea9a08

Change-Id: Id9a4e23ab38e2a096629f78ad818f2c7c47817c6