Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev