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