Merge "Don't clear the output array if it failed to open the proc status file" am: 79a1b3a333 am: d939e46698
am: b8cce2152a

Change-Id: Id71a526c8b20b3413b2c398e582900c0a355be78