am b8154d5c: resolved conflicts for merge of e8a4b652 to lmp-mr1-ub-dev

* commit 'b8154d5cc707921fadf92fedc65a66a3e8901126':
  Revert "Quick: Create GC map based on compiler data. DO NOT MERGE"