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

Change-Id: I44853f0e2f56d33c8126de0799bd5129799592bd