Merge commit 'c956f0dcb3d93dd0f3ee0a3daafaf2da8212402e' into mncvtdev-to-mmwirelessdev-merge-2015-12-10