Merge f3359b6642c9a186e622a7b0862a3094f9d5cf97 on remote branch

Change-Id: I5e5539dffe4e3100d4c159edbca4d62aab0310bb
tree: d8196c60a229db844eb3fa097d35f3861c681211
  1. config/
  2. msm/
  3. Makefile