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