Merge ade93068e6affc164ea92681a522419e43d65ce5 on remote branch

Change-Id: I1fc52d5518948182cd0d2fc164421d8df0e72929
tree: 5dcdd8a6b290edf1f4d3b06f36c46a0aaf657e8d
  1. config/
  2. msm/
  3. Makefile