Merge 1a661700c013f5ca282031d759ce729e46cfe629 on remote branch

Change-Id: I97ed4db252c6bae50cc6b1f40dd7686ad18a2034
tree: b03103a54cf50d93aae673d05e62059029c91c8f
  1. config/
  2. msm/
  3. Makefile