am 9eb4c891: Reconcile with ics-factoryrom-2-release

* commit '9eb4c891a3db118f2546af7593c6251f3210f3ef':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"