am 808ee95d: Merge "Correct proc file reader, optimizations." into ics-mr1

* commit '808ee95dd4244da6ae767d3ddd003ed7b48937d0':
  Correct proc file reader, optimizations.