Merge "Dexdiag returns error when no maps found"