Merge "Cumulative security patch from commit ca68a8b561c48393c8ba25055ce294caaa3ac008" into m-wireless-dev