am 5d3acebd: resolved conflicts for merge of c8d000a1 to lmp-mr1-ub-dev

* commit '5d3acebd1fe859cbf6fb3831815eb7f3c1f3e442':
  Revert "Quick: Fix "select" pattern to update data used for GC maps. DO NOT MERGE"