am d7f36121: am 50d0511d: Reconcile with ics-factoryrom-2-release

* commit 'd7f36121f64fbbfaf640f073e01c43441b149d97':
  Revert "Improve the slow query instrumentation."
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
tree: 1d90b398fb949e1e316b658c863f2f87f7814afb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE