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

Change-Id: I84de7311c7af6c58cefa813f4dc95e8cdf5ebf8e