Merge 4e1052e87a79791f8d263ba152cfe5c9158313f0 on remote branch

Change-Id: I79f20217c653435c7b353270d7fc60306a81a70e
tree: 6e3dff629ab352c3167ca33eddb8bd77a3f6345f
  1. config/
  2. msm/
  3. Makefile