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