am fb695b34: resolved conflicts for merge of 7cc8f9aa to lmp-mr1-ub-dev

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