Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f am: dd0f409b16
am: 9476d61c81

Change-Id: I6a608900ae83533be6761cc4de67b827e777878a