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