Merge ea1ec63548943fedd3a1f8f8f7a9832c0fac5c51 on remote branch

Change-Id: I403a6286024e41a51cdeb27f4e9503a78e69fcb1
tree: c4b1c72fd3c554daf5e7e0636b969f957cd0f33d
  1. config/
  2. msm/
  3. Makefile