Merge commit 'df393e9776b983c51c97c1343032bfa9d20f39a3' into mncvtdev-to-mmwirelessde...
Tyler Gunn [Fri, 11 Dec 2015 02:50:03 +0000 (18:50 -0800)]

Trivial merge