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

Change-Id: I9567a83070a1203e58615e1f87a3e217371dbc3e