Merge commit 'c2e2522e' into lmp-mr1-ub-dev

Change-Id: I447844722fdafd15a0c2dd6a0a2268d9ab094e90
tree: 461c827954978e9533b8c0c5fbdea31e1399e565
  1. com/
  2. .gitignore