Correct proc file reader, optimizations. am: e370a59bec

Original change: undetermined

Change-Id: I22ac22e2c3b850f8ae629d18ef4029b6ce2f637b