Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f
am: 4710a7ad03

Change-Id: I802eeffca56af708e47bcc1932708ac27f8e3262