Merge commit '4c81117cd793aef6919495f5928a46f265d3ef7c' into mncvtdev-to-mmwirelessde...
Tyler Gunn [Fri, 11 Dec 2015 02:52:06 +0000 (18:52 -0800)]
Change-Id: I3a24f26df9ae1813f3ffc05501ae78e794ec814e


Trivial merge