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