Merge f31d17c6e9f05cf77bd429615c8f6136838cfba0 on remote branch

Change-Id: I2e04b87ad37c374dc5b79647f5d560e1e26f14c7
tree: 06e09699e4b55bc945850058cb1d373826c497c6
  1. config/
  2. msm/
  3. Makefile