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