updates from msm-3.0

Change-Id: Iff121be26323aade00d2aeba418338e3bd426547
Merge "updates from msm-3.0" into jb_chocolate