Merge Linux 4.4.40 to master

Change-Id: Ie8115c17a8caf7e069f6cacba722e309234c28d3