Merge 53c614981cdfb43a823e5a345874935b901c86d4 on remote branch

Change-Id: I764904f69e913bd87f04b87d22cee6e35dd710e6
tree: 9889abef1fb5d09bb57cfc4e56033a5eb4160481
  1. config/
  2. msm/
  3. Makefile