Merge "Fix issues with extractor dumpsys" am: 24cd6995c7 am: 579955d0ce am: 7944a0a546
am: d84aee8fc9

Change-Id: I32e46905233c052dbc846241f5bfe33399d360f8