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

Change-Id: I075dfc9daa01e3202c8054690915c43cb0567cac