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

Change-Id: Ic509da05ce01eb753ccd6eebae0fa5e66cf4577c